Small fix to let mnemonics work with notebooks.

Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
	mnemonics work with notebooks.

diff --git a/ChangeLog b/ChangeLog
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b2978dff89057ccf6cb64337e58499eaa680f2dc..c92cd6117abcc02dbd01760dffa9236d1f9197d9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Dec 11 18:55:16 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_mnemonic_activate): Small fix to let
+       mnemonics work with notebooks.
+
 Tue Dec 11 15:25:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): Change

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index b85fc52e1a17a0a2381887eb676b784e71110c6c..450f114ac47f2c9bf9603ac0ddf034dc90a1e27f 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -666,6 +666,10 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
    * widget's ancestry.
    */
   parent = widget->parent;
+
+  if (parent && GTK_IS_NOTEBOOK (parent))
+    return gtk_widget_mnemonic_activate (parent, group_cycling);
+  
   while (parent)
     {
       if (GTK_WIDGET_CAN_FOCUS (parent) ||